Add final version of generator interface