Template and registration enhancement; plan update