Changed to static libraries