Ported the library
Change to soma-module but without auto SP