Adding WAModel changes