Move to C# 6