Switching to tab-based approach