Fixed issues with displaying hierarchy when adding a class or inheriting