better uri handling, attribute redesign