Added address size option