Some changes to subproject