Refactored to create schema properties as entities.