Added changes for generating .so files