Latest updates to match new API settings