Making more things overridable