Updated to support overrides