TIQ refactor, no verifications
logging refactor