Issue #151: Samples and enums