Remove make_unique() since VS does not support it