Changes for #12, retrieves classes when loaded