1.2.0 - use key instead of id