Updated options so they're automatically added as arguments