Improved fluent API and cleaned up implementation of Property Fillers