Updated API, pre removing of rest framework