Make inclusion of mode conditional on manifest settings