Added argument resolver and annotation