New changes for DB templates