improved class loading