Adding model stubs #4
CS fixing