Adding more features from the power tools