LPS-49576 Can't we follow pattern that we use in other places?