Updated to use new identity methods
Adjustments for new allocations