Add custom environment parsing rule top deal with edge cases