Merge "Refactored method to get UIDs." into nyc-dev