Removed entity-representation dependancy