Extended model
Added test case