Added Entity Builders