Added Methods, updated extension definitions