Add pointers to enforce lifetimes