Additional improvements to the DB spec