Added support for more APIs