Even more entity wrapping