Enhance property expression handling
More property expression handling enhancements