Renamed some methods
Repackaged visitors