Added supoort for static libraries