Added first layer of memory management to claims