Added functionality for other types of Value Providers
Fixed warnings reported by Intelli
Fixed warnings reported by Intelli