Prioritize the generic interface, bump to 2.0.0