Merge "Refactor Inspector API"