Some new changes with libs and project api