Structure changes to use in web IDE