Added Common Lisp and C++ support