-Refactoring and generalization of constraint and constraint container classes