Added ENV config support