Improvments on Cogniton/Item works