Adds header, improves set operator parsing