Handle vendor file template nicely. Update comments.