Add flexibility to model-checker and refine model