Added Daniel's file implementations