Added check_initial_call and check_initial_registration functions