Added validation for exchange type and calendar