Added a better and more complete implementation for attributes with sane class names.