Moved class modification methods into own file