Feature/general graph