Moved associate logic to Vanilla library