Changed the Security classes to support the new ViewModels