Switched to Scala tuples