Added initial support to more APIs