Add MAC addresses handling