Added changes to API (retaining old api for allowing other projects to compile)