Removed unique pointer it will no longer be supported