Added VOID, changed other map keys to uppercase