Itemizer: Added security checks, efficiency improvements