added missing stuff to enable old featuers again