Feature/721 allocations