Replace toaster dependency