Update main to get ids as well