Refactor, Add missing libraries