Switch from data-default to data-default-class

Resolves #24 and #27