LPS-44089 leverage the new attribute in places in which it saves lines of code