adding support for db changes etc