Extracted PropertyFiller subclass

This makes it much easier to implement new property fillers