LP1829567 Angular access key improvements