Refactoring annotations into more specific 'types'

[MrHash]

For stricter configuration of mappings according to these options: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html

[MrHash]

Or should we keep it simple and let the user work it out?