Add 2.0 alpha support