Interim work on account links api