Make custom user storage use delegation instead of inheritance [#3]