Make graph more modular