Added basic environment support