Improve property-based configuration