New option is added, class loading mechanism is changed