Merge "Added few more APIs support"