Lib user

This refactor was needed in order to cleanly get a few tests passing on Drupal 8.