Moved schema parsing into fs_schema