Added more API stuffs