Further updates to registration system