Added controller and in-memory client-side provider