Added Base Classes and XML Structures