Moved graphic ownership to core