Upgrade code for Dictanova sample