Some changes and update submodule