Added is_active field