Add flexibility for row size