Improvements and definiton the toolkit use