Functions output both dictionary and list of objects

[Peyman-N]

Some functions output both dictionary and list of objects, this is unnecessary as extracting a list from dictionary is relatively straightforward without a big hit to run time. The next release should be organise having this in minds.