Changes to Register-handling