Add Strategy resolution