Replace static skeleton templates with unified skeleton type map