Change on USP inputs generation