Updated outdated APIs