Add support for FP prefixes