More misc class additions