Updated for klib