Added updated mode handler now residing within proof, also with updated mode interface