Added NAME= parsing