More use of override