updated Registry to handle extra arguments