WIP: Make user resource optional