Adding tooling api support