Various updates, including attribute support