Add Registration spec and improve Registration Controller