Added and upgraded mustache