Solved deprecaiton issue