Adding -va functionality