Moved Row into model package