refactorying bus package