Refactored some fields