Added calendar sub-module