Added variable number of buses