Added the possibility to provide a custom calendar