Moved methods to the abstract class