Add Template Properties and Alias serialization