Updated to handle roslyn changes