Added API functionality

Same here and throughout the file