Added env and patches