Some changes to ACL switch