Improved options

usp.layout_template, usp.user_roles, ...