Added stuff for lib