Added static library support