Missed requirement
Fixed method deprecated