Moved some methods to the base class