Replace Indexing Strategy object with annotations

Issue #14