Moving methods up to parent class