ticket:3 Model initial changes