Added proper fields like template and version