Cleaned up interfaces and XML code