Exta constructors are removed, refactoring of Controllers