Improve Elixir support