changes to framework and db schema