Added flag for cmms