Updated API to be dynamic class loading