A few more library functions extracted