Added more api features