Added startup class assignment support to the master