Updated auto-complete and c support