Move Record under Db, update unit tests and docs