OP-1119 Adding some more boilerplate code.