Adding principal to group mapping support.
Clean up