Add %env section support