Fix api methods to follow Cake3 a bit closer