Cleaned up provider