Allocate refactoring