removed ServerEnvironment, using Environment instead