Added some overrides