Refactored entities