Properly return dictionary