Preparation for verify command development