Further improves hackergen support