Minor refactors, added Koa again as super