Added more API functionality