Added assembly templates