Added "Surface" and "Font" type