Upgrade the code to support Elixir 0.8.1