Add core class for numbering
Fix numbering