Update deprecated APIs
Merge pull request #1 from yrashk/api-update

Update deprecated APIs