Merge "Refactor inspector API"