Changed Environment constructor parameters