Updated to newest API