Changes to work with better duplicate definitions check.