Changed Options to Args and refacted Args