Updated to include new API versions