Move requests into notification class