Added environment resolver and refactored property resolver.