LPS-32400 - Add User Macro and all dependencies
LPS-32400 SF
LPS-32400 Just derive it? No need to declare it.