Partial migration from @ pointers