Added enhancer class