Improved SinkLibrary and User class