Add decorator api.model and get some return values aware of the new API