rebuild API from devce to use dictionaries instead of strings
little fix