Add better validation on enviroment_variables