Feature/add environment