Reworked the internals of the generator

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>