Improve registration system