Simplify auxiliary classes