Small changes on reference model manager