More erlang support