Rebase and add all libs