Added Omni Completion options and reworked the C++ templates