Reorganized custom variables