Added union
Added parsing parts