Modified Model, added Client pages