Refactored entities for more efficient usage