Improving graph flexibility

Signed-off-by: Archbang85 <archbang85@gmail.com>