Removed unique_ptrs, added initializers.