Registration template rework