[Feature] Add active and inactive list