Modify service code to be more consistent with neko.activity