Added usage of the Symfony Finder component to reduce the code base