made skeletons template-aware