Refactoring, added Annotatible class, so now parsing works on annotated values.