Refactor components that are waiting to be listed in one place to prevent race conditions