Partially refactored to entity objects