Cleanup dictionary validation usage by using Option[FilePath]