Improving structure of the Calendar Pluging