Changes based on feedback and discussions

- discussions in pull request
- remove resolve strategy from API