replaced rabl with grap entity