Alter to support null tokenRespository and add invoice and contacts