Migrated API to more readable dictionaries