Updates for Clojure support