Refactored Entities