Prepare for implementation of addReference and addAttribute from client