Improve arguments / add double processing / improve caching