Added custom dating to schema