Updated version
Refactor some names