Improve Warehouse spawn system