More flexible ContentType implementation

Fixes issue #76