Updated API as per Issue #18