Made entities a bit more generic still more to do