Class Additions