Added optins model and controller