Support for RubyAMI 2.0

WIP