Improve to make more readability on Schema Viewer