Feature/allocation-client