updated environment macros and introduced env constants