Updated fileparser