Added environments for 1609 and better managing 1601
10 files changed