extended the modular logic to differentt types of requests