Updated lib file and minute changes to using statements