Add class to simplify signal handling