Updating configuration to use new 'mode' feature