Refactored GraphService Method and Updated Views