Base changes for the java refactoring items: Entities Consistency and Single EntityList