Updated to include registration