Minor update: use basic methods for derived functionality.