Sample6bis model update and code generation