Your suggestion is brilliant, I have made the changes accordingly. But I would keep the default one in order to test the case when no override method is present.