Severely enhance the api structure