"Improve" server by using more generators
Quick client hack