Added calendar utility class