Thank you for these edits! I was just editing around Stafford County earlier today and noticed how intrusive it was to add other point features (like neighborhood nodes) when addresses were separate from their respective buildings.