Refactored Query args and SimController