With Updated Schema