Added calendar types & methods