Added prototype ACLs and small changes