I suggest that you make the lemmas in the Andersen-Forbes Phrase Marker linked to a Hebrew lexicon [possibly HALOT]. This would make it even better. As we are all aware, the word meanings for a given word can vary [according to context] and this feature would allow a user to check AFPMA's choice of a meaning.