Updated constructors

New constructors without variables in classes.