Updating to work with koast changes