Improved property type parser