Add 4.4(19) support
Add missing extras
Fix library name for 18