Re-arranged attributes