Added overrides and exceptions