Added counts to subclasses