Updated as per registry