modificiations on models, router and store