Added a new filed, refactored