Adding better rules for entitystandalone