Added extra parameter to handle schema changes