Added core api functionality