Cleaned up scope provider