Updates model definition and environment.

Reviewed by: renuka