Redesigned upload catch backend