Registration Improvments