adding schedule and DataTimeRage domain helper support
resolving conflicts