Topic: Simplify implementation