Updated code base for libraries ...