More registration automation