Moved the annotation from the ValueHandler to an outside interface.
Removed the isAnnotated query method.
Removed the annotation methods left.