There is no sense to refactor this now. We need to make sure that we have architecture for generator done properly.