Moved some methods into other classes