Added multi-boards detection capability