Improve Clojure support