Refactored material management