Add Custom Tab support Jul 8