Move user options into helper