Simplify implementation