Old bug fixes and optimizations
Add virtual roles