Improve registry GetByID