minot tweaks
Refactorings and adding wrapper around property container