Added X11 structures.
Used Current.Work.