Change the way how thief works