Updated with URI, closes #164