Made c# 5 compatible