updated api's to reflect new structure