Add library support