Re-arranged definitions: Now they are structured for expansion