Add which buki functionality