Updated extends to add static members to subclasses to tidy code