Bug Fix: Fixed changes of API to collections instead of lists.