Added active/inactive tracking