Moved initializers to separate classes