Added address limiting