[1.5.2] Refactor: added File (PG*, JL*)