Modified mustache file and added populate fields to source