Added some more RDB code..