Moved some methods out of the objects