More refactoring to account for concepts to variables/domains change