Updated entities and endpoints

We should get rid of this file.