CARE #60: Added area handling