Update for more subclasses