Add other supporting classes