Fixed dataModel updating