Small cleanup. Changed DTD and fixed serialization issue