Improved the pass for generating properties