Added a handler so that it can be used in supermodels. + many fixes