Added custom feature tools
Made changes, added custom feature tools