Changed format of range definitions to use objects instead