NULL property type support added