Added a few more upstream directives