Adding data checks;
Fixing customClass implementation;