Added Group and Role entities