I mostly kept both forms as they existed in the past and there wasn't significant complexity to supporting first and custom find types.