Added post-registration handler