Api structure changes