Re-add scheme model to wrap api
Simplify controller logic