fixed to support updated schema