added control class support