UContract_ and some refactoring