Re-design Row class to use a map