Changes to accomodate dynamic class loading