Changes for Active flag check