Move more methods to super class.