Merging in the get listing functions
Removing the old dependency