WIP, hack to make generated functions public