Use new findByExtension function

See #142