Added function wrappers in Simulator and protocol update (makes more sense now).