Adding controller extension and cleaning up options.