More work on external libraries