Refactoring, support for constructors with parameters added