Finish adjusting api to work with core klein