Moved creation of property builders to import data method