Simplified dep/enum, nothing breaks