Moving more methods into own file