Added overrides