Added optional libraries