Updated entities and endpoints

Maybe this should be an enum?