Lib API slightly changed