Should use dashes for ids now