Added all control classes