Add make_unique and start using it