Constructors moved to separate files