added more part of data in to templates