Added request handling