I used generation as a temporary solution :) but maybe this is really an interesting move and it should not be removed ... There is something to think about.
