updated classes with appropriate context