Removing need for entities, adding endpoint configuration, cleanup and minor bugfixes