Updated procedures to be inline with wrapper changes