Replace dataclasses with subclasses for better type inference

Replace dataclasses with subclasses for better type inference #489