Move business id creation to the right place