New fields in Staff Roll popups, Refactored classes