Added RawDatabase support
Further raw record parsing