Change pointers to references