[WIP] Follow base api 1.0

UGLY