Removed XML and added support to lists only