Updated code according to latest changes in hermes-bus module