Added default attribute detection