Update core libs to be less copy-pasty