Adding override feature