Improvements to SourceBuilder to handle more classes