Migrated from static holders to processing context