Moved class extensions to an initializer