Issue #66 rename generic class and use core auto-loading functionality