adding model changes and some fixtures