Changed Statements to use unique_ptrs internally