Update basic design

Added additional basic design classes.
Improved existing basic design classes.