PS-11 Some small refactoring to properties handling