Continued work on security classes.