Cleaned provider implementation