Added overrides and listeners