Modified data structure for information used by core
Merge remote-tracking branch 'origin/development' into development