Extend usage of unique_ptr + universal constructors