Updated to only have a markup subgenerator