Pointer based add and remove methods for #392