Made configuration from command line instead of hardcoded