Is this worth exposing to more files?