Improved PFRule data types