Changed diagram to include attributes