Added calendar feature for UAT