[FrameworkBundle] made code more generic