Updated datacontext issue