enhance calendar model