Update some implementations