= core: avoid using tuples in favor of case classes