Current modality support added