Cleanup, added more metadata fields.