[CS] Change up Calendar module a bit