Add more in class code