Add support for room version 3