LPS-47664 Use Key instead of Id and avoid word Extension