Sourcecode cleaned up. ToDo -> Entity ID's