Added missing VCAP support code.