Added some method into some classes for improve some magic stuff
Added tool package