Added extra options for v1.5