Added db-mapping from suite