Upgrade to version 7

Is it time to use mustache here? :)