Removed dependency on settings