FIX: Make SourceResolver public