Add libraries plus comon functionality