refactor entities methods