IMHO works for now as fist step towards an extension point