Converted options to proper arguements