Improve clojure support