Fix wrong class name and add extra functionality.