Added additional core and infrastructure libraries