Add more object/classname casting