Added two custom classes