update headers to match new contructors