Updated args parsing