Thanks for the awesome suggestions. On point 2, I had removed the roles part from the software code, since it was absurd at the moment. Just need to update the same in docs.