Adds handling for self-serve statements via portal