Implemented draft version of API