Added basic environments support