Adding environment stuff