Add elements

Add sp:Optional support
Add sp:Union support