Added core of API