Use a generic map of attribute values to SQL

Change-Id: Iad31ea8dceeaff40f47bcc2dcf8157cb42c43737
Merge "Use a generic map of attribute values to SQL"