Added active flag to models