Changed the namespace of the data objects and other minor changes.