Added Generator + UnitTests & changes to Config