Reworked file schema