Moved to constructors
Missed file