EndNote: databasing individual notes

It appears EndNote XI will allow me to associate one file representing a list of notes with a particular entry. However, I’d like to have multiple notes associated with a particular entry and handle them separately.

e.g., I might have a list of notes associated with an entry whose keywords are “Behavioral”, “Finance”, and “High-Frequency”. But I’d like to give the indivdual notes different tags like “Methodology”, “Data”, or “Research Idea” to distinguish the notes from each other. It would be nice, then, to search all my notes at, say, the intersection of “Behavioral” and “Research Idea”

Does EndNote XI provide any fuctionality like this? Does it play on providing any functionality like this in the future? Will I have to turn to a system like IdeaMason that does include this functionality?