Updated to work with latest version of the RunTime