Added configurability for OA stuff.