Add -addr and directory flags