Added custom feature tools