ticket:13 Changed models a bit