Updated for SDK changes.