Further insight improvements