Updated lib to new syntax