Added support for monthly maps and bi-weekly maps