Re-adding the libs functionality