Removed AWPreferences dependency