Update ACL logic and validations, removed resource id parsing