Adding support for dev tools as well