[ADD] Added logic for monitoring gateway + draft logic