Bug fix, added ability to specify Generator Base