Update for new filament class structure