Modified constructors. Rafactoring