Adding registration information (and simplifying the setup)