Some basic changes to the api