Adding tools features and few improvements.