YH-482: Node dependency for calendar feature
YH-232: Pretty comments