Removed generator.sh. Fixed constructor param handling.