Added options, xml and csv serialization.