added custom classes with crash fix