Fixed submodule
Fixed parsing logic