Adding Class Structure