Begin migration of security items outside of classes.
Additional modifications to models.