Make callback be optional
Added date attribute