Add selfservice support