Updated URI construction to only grab what data we need, and updated spec accordingly