Changed all object allocations to use makeRef instead of the new operator