Minor Design Additions