Updated With Upstream Fixes - Removed Class Searching in Path