Refactored response handling and added partial dlr module