Expanded definitions to add additional comments