Added Kotus support and issue fixes