added entity and repository helpers