Request module rework