Changed registration format + new command line args