Few Improvements to support multiple graphs