Wrapper 2.1: added new Calendar entities