Improve attributes and annotations feature