First attempt at allowing direct access to non-generic APIs Issue #135