Refactored to use the new API Settings