Feature/add environment

This change looks irrelevant.