Added custom classes maps