improved class loading at deploy time