AVALANCHE: Move some more functions to Graphics