Add more c.c vars
More c.c vars
Fix imports