Lib improvements
Config extracted