Changed to definitions to unique IDs