Moved all v1.0 features to Controller form