Redesigning declaration fields.