Added standardized skeleton