Address Code review comments.

Change argument containers from arrays to dictionaries.