Adding Monique 2.0 features