Refactoring Spring Data, resolves #1