Made minor changes to API