Add libraries and fix skeleton