- workspace material handling refactoring