Add Class and Functions