Change query plan definitions to allow multiple entry points