Added some C# 6 features