Add beginning of library support