Updated off depreciated API's