Moved entities methods outside of services and into entities (cleaned up) + Docu