Reorganized properties and refactored property attributes.