Added more to api controller