Library Update

Added more library support