Replace date method with delegate