Updated fs schema parsing