better embedded graph support