Use new schema and restful api