User Lib changes