Updated enum to initiate instanced classes