use decl-api types
Added missing files, gen