Updated with Yasnippet