Add some more lifetimes