Extract Class
Rename methods