Added notice in service and worked on graph