Move to MySQL-style dicts